Currently tinc init script will delete the generated configuration folder and then...

This patch will first check if the generated configuration folder exists and then delete it, after that it will always create the configuration folder.

diff --git a/net/tinc/Makefile b/net/tinc/Makefile
index 67618e32f064e2d198e931c6455c4d5da1d2d16a..945ca781cdcb74bf114e4ffb03784b79ab042d0d 100644 (file)
--- a/net/tinc/Makefile
+++ b/net/tinc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinc
 PKG_VERSION:=1.0.24
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages

diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init
index b24bc682ecef4e576c1b6be90f2780a53422d4c6..e49b358770f34e48779d28742bfa33847cee113c 100644 (file)
--- a/net/tinc/files/tinc.init
+++ b/net/tinc/files/tinc.init
@@ -135,10 +135,8 @@ prepare_net() {
 
        section_enabled "$s" || return 1
 
-        # rm old config
-        rm -rf "$TMP_TINC/$s/"
-
-       [ ! -d "$TMP_TINC/$s" ] && mkdir -p "$TMP_TINC/$s"
+       [ -d "$TMP_TINC/$s" ] && rm -rf "$TMP_TINC/$s/"
+       mkdir -p "$TMP_TINC/$s"
        [ -d "/etc/tinc/$s" ] && cp -r "/etc/tinc/$s" "$TMP_TINC/"
 
        # append flags